shorthand: Update border-image parsing

Also update tests. None is not a valid value...

diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index f565e7f9ed0dc71c946491443fb5a9390ce03dfd..e89633d70b43a0b5f47bed08b034de3dd3552ea5 100644 (file)
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -36,6 +36,14 @@
 
 /*** PARSING ***/
 
+static gboolean
+value_is_done_parsing (GtkCssParser *parser)
+{
+  return _gtk_css_parser_is_eof (parser) ||
+         _gtk_css_parser_begins_with (parser, ';') ||
+         _gtk_css_parser_begins_with (parser, '}');
+}
+
 static gboolean
 parse_border (GtkCssShorthandProperty *shorthand,
               GValue                  *values,
@@ -155,9 +163,7 @@ parse_border_color (GtkCssShorthandProperty *shorthand,
       g_value_init (&values[i], GTK_TYPE_SYMBOLIC_COLOR);
       g_value_set_boxed (&values[i], symbolic);
 
-      if (_gtk_css_parser_is_eof (parser) ||
-          _gtk_css_parser_begins_with (parser, ';') ||
-          _gtk_css_parser_begins_with (parser, '}'))
+      if (value_is_done_parsing (parser))
         break;
     }
 
@@ -170,89 +176,38 @@ parse_border_color (GtkCssShorthandProperty *shorthand,
   return TRUE;
 }
 
-/*** OLD PARSING ***/
-
 static gboolean
-border_image_value_parse (GtkCssParser *parser,
-                          GFile *base,
-                          GValue *value)
+parse_border_image (GtkCssShorthandProperty *shorthand,
+                    GValue                  *values,
+                    GtkCssParser            *parser,
+                    GFile                   *base)
 {
-  GValue temp = G_VALUE_INIT;
-  cairo_pattern_t *pattern = NULL;
-  gconstpointer *boxed = NULL;
-  GType boxed_type;
-  GtkBorder slice, *width = NULL, *parsed_slice;
-  GtkCssBorderImageRepeat repeat, *parsed_repeat;
-  gboolean retval = FALSE;
-  GtkBorderImage *image = NULL;
-
-  if (_gtk_css_parser_try (parser, "none", TRUE))
-    return TRUE;
-
-  g_value_init (&temp, CAIRO_GOBJECT_TYPE_PATTERN);
-
-  if (!_gtk_css_style_parse_value (&temp, parser, base))
+  g_value_init (&values[0], CAIRO_GOBJECT_TYPE_PATTERN);
+  if (!_gtk_css_style_parse_value (&values[0], parser, base))
     return FALSE;
 
-  boxed_type = G_VALUE_TYPE (&temp);
-  if (boxed_type != CAIRO_GOBJECT_TYPE_PATTERN)
-    boxed = g_value_dup_boxed (&temp);
-  else
-    pattern = g_value_dup_boxed (&temp);
-
-  g_value_unset (&temp);
-  g_value_init (&temp, GTK_TYPE_BORDER);
-
-  if (!_gtk_css_style_parse_value (&temp, parser, base))
-    goto out;
+  if (value_is_done_parsing (parser))
+    return TRUE;
 
-  parsed_slice = g_value_get_boxed (&temp);
-  slice = *parsed_slice;
+  g_value_init (&values[1], GTK_TYPE_BORDER);
+  if (!_gtk_css_style_parse_value (&values[1], parser, base))
+    return FALSE;
 
   if (_gtk_css_parser_try (parser, "/", TRUE))
     {
-      g_value_unset (&temp);
-      g_value_init (&temp, GTK_TYPE_BORDER);
-
-      if (!_gtk_css_style_parse_value (&temp, parser, base))
-        goto out;
-
-      width = g_value_dup_boxed (&temp);
-    }
-
-  g_value_unset (&temp);
-  g_value_init (&temp, GTK_TYPE_CSS_BORDER_IMAGE_REPEAT);
-
-  if (!_gtk_css_style_parse_value (&temp, parser, base))
-    goto out;
-
-  parsed_repeat = g_value_get_boxed (&temp);
-  repeat = *parsed_repeat;
-
-  g_value_unset (&temp);
-
-  if (boxed != NULL)
-    image = _gtk_border_image_new_for_boxed (boxed_type, boxed, &slice, width, &repeat);
-  else if (pattern != NULL)
-    image = _gtk_border_image_new (pattern, &slice, width, &repeat);
-
-  if (image != NULL)
-    {
-      retval = TRUE;
-      g_value_take_boxed (value, image);
+      g_value_init (&values[2], GTK_TYPE_BORDER);
+      if (!_gtk_css_style_parse_value (&values[2], parser, base))
+        return FALSE;
     }
 
- out:
-  if (pattern != NULL)
-    cairo_pattern_destroy (pattern);
-
-  if (boxed != NULL)
-    g_boxed_free (boxed_type, boxed);
+  if (value_is_done_parsing (parser))
+    return TRUE;
 
-  if (width != NULL)
-    gtk_border_free (width);
+  g_value_init (&values[3], GTK_TYPE_CSS_BORDER_IMAGE_REPEAT);
+  if (!_gtk_css_style_parse_value (&values[3], parser, base))
+    return FALSE;
 
-  return retval;
+  return TRUE;
 }
 
 /*** PACKING ***/
@@ -678,8 +633,8 @@ _gtk_css_shorthand_property_init_properties (void)
   _gtk_css_shorthand_property_register   ("border-image",
                                           GTK_TYPE_BORDER_IMAGE,
                                           border_image_subproperties,
-                                          NULL,
+                                          parse_border_image,
                                           _gtk_border_image_unpack,
                                           _gtk_border_image_pack,
-                                          border_image_value_parse);
+                                          NULL);
 }

diff --git a/tests/css/parser/declarations-valid-22.ref.css b/tests/css/parser/declarations-valid-22.ref.css
index b853db8fd56cc69f0bc47a6ea87390ce5e51ba13..ae0b2a9790f7b58d62491847f4481a8cbb8ba048 100644 (file)
--- a/tests/css/parser/declarations-valid-22.ref.css
+++ b/tests/css/parser/declarations-valid-22.ref.css
@@ -2,5 +2,5 @@
   border-image-repeat: stretch;
   border-image-slice: 3 4;
   border-image-source: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAABmJLR0QA/wD/AP+gvaeTAAAAFUlEQVQImQXBAQEAAACAEP9PF1CpMCnkBftPnd1xAAAAAElFTkSuQmCC");
-  border-image-width: none;
+  border-image-width: initial;
 }

diff --git a/tests/css/parser/declarations-valid-23.ref.css b/tests/css/parser/declarations-valid-23.ref.css
index 7eb45bcd96c3485dee5af310577b674ea74ce363..c50e21600d8c62887cebb330a2b220bf41e4c3c4 100644 (file)
--- a/tests/css/parser/declarations-valid-23.ref.css
+++ b/tests/css/parser/declarations-valid-23.ref.css
@@ -2,5 +2,5 @@
   border-image-repeat: repeat stretch;
   border-image-slice: 3 4;
   border-image-source: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAABmJLR0QA/wD/AP+gvaeTAAAAFUlEQVQImQXBAQEAAACAEP9PF1CpMCnkBftPnd1xAAAAAElFTkSuQmCC");
-  border-image-width: none;
+  border-image-width: initial;
 }